Fix redirect on login for instances behind reverse proxies #6371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On instances where base_url has been set for use behind a reverse proxy, logins are incorrectly redirected. This happens because REQUEST_URI is set by the proxy: 1. librenms has base_url set to http://site.com/nms/ 2. Browser requests http://site.com/nms/ 3. nginx reverse proxies /nms/ to librenms at http://somehost:1234/ 4. librenms sees REQUEST_URI as "/" 5. librenms logs the user in, but sends "Location: /" to the browser. This redirects to the wrong location. To resolve, concatenate REQUEST_URI (which is relative) to base_url. As base_url is slash-terminated, crop the trailing slash. This should have no effect on users with default settings and will correctly redirect instances behind reverse proxies.
…oc/General/Contributing.md.
|
Auto-Deploy finished, Test PR at http://6371.ci.librenms.org or https://6371.ci.librenms.org |
f0o
requested changes
Apr 6, 2017
html/includes/authenticate.inc.php
Outdated
| @@ -96,7 +96,8 @@ | |||
|
|
|||
| $permissions = permissions_cache($_SESSION['user_id']); | |||
| if (isset($_POST['username'])) { | |||
| header('Location: '.$_SERVER['REQUEST_URI'] ?: $config['base_url'], true, 303); | |||
| // Trim the trailing slash off of base_url and concatenate the (relative) REQUEST_URI | |||
| header('Location: '.substr($config['base_url'], 0, -1).$_SERVER['REQUEST_URI'], true, 303); | |||
There was a problem hiding this comment.
This variable does not always have a slash at the end.
Please add a sanity check before cutting off a character from the base_url; worst case you kill the tld.
|
Probably easier to just do something like rtrim($val, '/'); |
f0o
approved these changes
Apr 6, 2017
|
Good catch. I didn't realize rtrim had that character mask param. Looks like that is both cleaner and solves the use case where there's no trailing slash. |
|
Auto-Deploy finished, Test PR at http://6371.ci.librenms.org or https://6371.ci.librenms.org |
|
The inspection completed: No new issues |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On instances where base_url has been set for use behind a reverse proxy, logins are incorrectly redirected.
This happens because REQUEST_URI is set by the proxy:
To resolve, concatenate REQUEST_URI (which is relative) to base_url. As base_url is slash-terminated, crop the trailing slash. This should have no effect on users with default settings and will correctly redirect instances behind reverse proxies.
DO NOT DELETE THIS TEXT
Please note
Testers
If you would like to test this pull request then please run:
./scripts/github-apply <pr_id>, i.e./scripts/github-apply 5926